From: Keir Fraser Date: Tue, 10 Jun 2008 08:24:47 +0000 (+0100) Subject: x86: Fix the build after HVMTRACE changes. X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14200^2~67 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/%22bookmarks:/?a=commitdiff_plain;h=4533ef7b2833219db5010eb2e604a0a446cea99a;p=xen.git x86: Fix the build after HVMTRACE changes. Signed-off-by: Keir Fraser --- diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index e4155e1a0c..9af2032b41 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -1175,12 +1175,9 @@ asmlinkage void svm_vmexit_handler(struct cpu_user_regs *regs) exit_reason = vmcb->exitcode; - if ( hvm_long_mode_enabled(v) ) - HVMTRACE_ND (VMEXIT64, 1/*cycles*/, v, 3, exit_reason, - regs->eip & 0xFFFFFFFF, regs->eip >> 32, 0, 0, 0); - else - HVMTRACE_ND (VMEXIT, 1/*cycles*/, v, 2, exit_reason, - regs->eip, 0, 0, 0, 0); + HVMTRACE_ND(VMEXIT64, 1/*cycles*/, v, 3, exit_reason, + (uint32_t)regs->eip, (uint32_t)((uint64_t)regs->eip >> 32), + 0, 0, 0); if ( unlikely(exit_reason == VMEXIT_INVALID) ) { diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 9b17e2ab0f..3292dc2d23 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2020,12 +2020,9 @@ asmlinkage void vmx_vmexit_handler(struct cpu_user_regs *regs) exit_reason = __vmread(VM_EXIT_REASON); - if ( hvm_long_mode_enabled(v) ) - HVMTRACE_ND (VMEXIT64, 1/*cycles*/, v, 3, exit_reason, - regs->eip & 0xFFFFFFFF, regs->eip >> 32, 0, 0, 0); - else - HVMTRACE_ND (VMEXIT, 1/*cycles*/, v, 2, exit_reason, - regs->eip, 0, 0, 0, 0); + HVMTRACE_ND(VMEXIT64, 1/*cycles*/, v, 3, exit_reason, + (uint32_t)regs->eip, (uint32_t)((uint64_t)regs->eip >> 32), + 0, 0, 0); perfc_incra(vmexits, exit_reason);